A couple of minor fixes, not worth any ChangeLog entry (?).

diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c
index 74502c80d4517ae63e43277d20f086d66293ba68..f22ad9873827138273930735b0fd8a8900726f0f 100644 (file)
--- a/gdk/win32/gdkpixmap-win32.c
+++ b/gdk/win32/gdkpixmap-win32.c
@@ -207,7 +207,7 @@ gdk_pixmap_new (GdkWindow *window,
     }
   if ((private->xwindow =
        CreateDIBSection (hdc, (BITMAPINFO *) &bmi,
-                        iUsage, &bits, NULL, 0)) == NULL)
+                        iUsage, (PVOID *) &bits, NULL, 0)) == NULL)
     {
       g_warning ("gdk_pixmap_new: CreateDIBSection failed: %d", GetLastError ());
       ReleaseDC (window_private->xwindow, hdc);

diff --git a/gdk/win32/gdkpixmap.c b/gdk/win32/gdkpixmap.c
index 74502c80d4517ae63e43277d20f086d66293ba68..f22ad9873827138273930735b0fd8a8900726f0f 100644 (file)
--- a/gdk/win32/gdkpixmap.c
+++ b/gdk/win32/gdkpixmap.c
@@ -207,7 +207,7 @@ gdk_pixmap_new (GdkWindow *window,
     }
   if ((private->xwindow =
        CreateDIBSection (hdc, (BITMAPINFO *) &bmi,
-                        iUsage, &bits, NULL, 0)) == NULL)
+                        iUsage, (PVOID *) &bits, NULL, 0)) == NULL)
     {
       g_warning ("gdk_pixmap_new: CreateDIBSection failed: %d", GetLastError ());
       ReleaseDC (window_private->xwindow, hdc);

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index c2ac52124ac06098016cae9e422c984a709dde33..2a306987bd4947fc908fc0c4018e7461c7e8d2ca 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <gdk/gdk.h>
 #include "gdkprivate.h"
+#include "gdkinput.h"
 
 /* The Win API function AdjustWindowRect may return negative values
  * resulting in obscured title bars. This helper function is coreccting it.

diff --git a/gdk/win32/gdkwindow.c b/gdk/win32/gdkwindow.c
index c2ac52124ac06098016cae9e422c984a709dde33..2a306987bd4947fc908fc0c4018e7461c7e8d2ca 100644 (file)
--- a/gdk/win32/gdkwindow.c
+++ b/gdk/win32/gdkwindow.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <gdk/gdk.h>
 #include "gdkprivate.h"
+#include "gdkinput.h"
 
 /* The Win API function AdjustWindowRect may return negative values
  * resulting in obscured title bars. This helper function is coreccting it.

diff --git a/gtk/gtk.def b/gtk/gtk.def
index 06046065dda40029791512f4127e76e4ee75e5b5..a7353d55a60637216b111df36168de83ad423385 100755 (executable)
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -958,6 +958,7 @@ EXPORTS
        gtk_rc_get_default_files
        gtk_rc_get_style
        gtk_rc_init
+       gtk_rc_load_image
        gtk_rc_parse
        gtk_rc_parse_color
        gtk_rc_parse_priority